merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 6 Jul 2011 23:28:00 +0000 (08:28 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 6 Jul 2011 23:28:00 +0000 (08:28 +0900)
commit2d7581821a1d9049667e061a13b09b39c7ac48ea
tree43188216e3efe68b3e823d53223b72a264e1bc7f
parent871a4631d4a38d53eb5f82d5c8cf6316b5384124
parentec5b528aac6118e65f8787c1047e1ea502291303
merge trunk
lisp/ChangeLog
src/ChangeLog
src/character.h
src/composite.c